Misc fixes

Mostly typos and missing self. Also add a FIXME about error
handling that needs some work