More config and setup

Added and then fixed the setup system