Minor Updates

Misc. tweaks and bug fixes.