tweaks and updates
Merge branch 'working-copy'