some small things, fixes #10