minor changes
corrected bugs
fixed bugs