Merge pull request #697 from tjcsl/dev

Dev
mode cleanups