Fix up weird naming, respect a margin, maybe change some design patterns.
Also, add javadoc comments for stuff that doesn't already have it.

Clean up unused imports along with this, as there are a lot hanging around.