Added the ability to specify if pretty URLs are being used or not, plus a couple of minor bug fixes.