Cleanup some views, squash some bugs.