Merge master changes to bugfix

Lots of changes on 6/3