minor updates to files
merge changes to master