fixing up admin
Nicer formatting.
tweaking based on merge
Some model related fixes and migration.
Handle exceptions correctly.
Fixing up mappings and admin