bug fixes, and added views