fixes after code review