Refactor fixes. Installer now functional.