Various small improvements

Resolves #39