Updates

Fixes #4, other improvements