Clean up and package

Various small tweaks when trying to get installer and component working on live site