another mass commit of changes to lots of stuff