More tweaking to forms
More fun with inline formsets
More fixes to inlines/messages