partial commit, small fixes