Fixes For Final Release

Fixed a few things I missed