A lot of cleanup of things
Changes to setup.txt