Various fixes, working on creating a setup generator