Update #7

Fixes, etc