updates to lots of files
merge