10:15AM Commit: few more bits and bobs