Final Fixes before Release

Hopefully.