Various Small Fixes

Various little fixes based on a few issues on the bug tracker, and one inconsistency when viewing the raws. Each individual 'issue' fixed is contained within its own commit. If anything need be done, feel free to tell me.