Various changes

Closes #1, kind of adds progress to #2.