Fixed a heap of stuff, added the remaining views.