Fixed errors...
Fixed bugs...