fixed modifying views
Logger cleanup
merge