merging some updates into branch

Had my wingit set to master by mistake.