evening commit, many changes