convenience changes

so that I can test at home and still have things work on the real server.