Misc. Bug Fixes & Installer Improvement