pretty fixes
Merge branch 'mrhines' of github.com:hinesmr/mica into mrhines
fixing bugs