Add models to admin, and various other changes