Switched id fields to Long because that's what they usually are in the real world.
Formatting.
Few minor changes and a bug fix.
Embedded tomcat.