Fixes and Tweaks

Some fixes and tweaks for Wahn's new stuff.