fixes and new views