polishing off some views, fixing small bugs