Resolves #72, and other small tweaks