more small changes to SETUP