A few tweaks and fixes

The most useful thing here is the fix for #41. The other two commits are convenience things I use on my instance (on Rizon) that you may or may not want.