Fix a few things

Closes #11, closes #12.