Fixings

Various bug fixes and annoyance tidy ups