WIP - Fixes a few errors to manage going to the installer home