fixed bugs
fixed errors