Finish 2 features
Fixes
Merge branches 'heather' and 'master'