fixed bugs, fixing more...