Update including fixes after code review