Fixes #3
Minor tweaks