bug fixes and view updates