Fixed a few issues that bugged me.