Mods and Fixes

Mods and Fixes to various software.