fixed lots of bugs...