fixed the bugs
fixed bugs