More bugs fixed. Compiles and tests successfully now, but there are still problems starting the vaadin application.