Fixed some negligences.