FIX: Multiple fixes

Closes #37.
Closes #38.

Not ready for review, have to make sure Travis is happy first.