fixed bugs
fixed all the bugs