changed more stuff. More Fixes. Better OO design changes