corrected bugs, done