Final tweaks. Resolves #5