Fixings

Various bug fixes and annoyance tidy ups
Is this the thing that was specific for apache/nginx?