Mjeverson/dev

A number of style and functionality fixes prior to launch