fixed bugs...YES i committed with compilation errors...Bite me!