working on fixing Setup

setup has some issues in it, working to resolve these