Fixings

Various bug fixes and annoyance tidy ups
Cool, just wanted to check it wouldn't now break apache usage. All looks k to me then, but given how code reviews generally work out when I do them, should probably let someone else check :P