some cleanup and added new views