Multiple changes

Fixes #4, #6 and #7