1.0!

code cleanups and sorting
removed most of debug code (some i will need later still there)