deleted lots of commented out stuff, 2 tests don't work
Merge pull request #54 from cenderin/master

changed id scroller location, fixed some other issues
pulled new fixes