Merged Mike to master

misc commit to merge Mike to master