Assorted fixes

The project now compiles with 'mvn package' and produces a .jar file already...