cleaned up script
updated setup config to match master