Fixings

Various bug fixes and annoyance tidy ups
Well Apache had a work around in it's rewrites that didn't work in nginx, but this cleans it up a bit generally.