general fixes

deleted some commented lines. code's much cleaner now