Merge pull request #109 from d3scomp/newgen-bures

Cleanup, FIXMEs, newly reverse-engineered architecture
Javadoc on the way...
Merge remote-tracking branch 'origin/newgen' into newgen-bures