Minor improvements

Completely untested, because I don't know how to test this project manually, and there are no automated tests. (Why are there no automated tests?)