Progress commit, tidy ups