some bug-fixes & cleanup on removal of _view.*
Merge branch 'develop'