code review

also already rebased on origin master