Code Cleanup and 0.6

Pushed to 0.6 BUT
Planned: rewriting the parser