This PR fixes a number of things - see the individual commits for their descriptions
Fix home#74 (closed)