Fixes to save and preparation of merged activity + temp fixes for #133 during merge

A more comprehensive version of #152