final fixes and changes from code review before merging