Fixing stuff

Fixes #4