JawnAdapter Progress

Did a couple dirty fixes to work around a couple problems in the
database to make the JawnAdapter work better.

This also magically fixed some formatting issues