Made some much needed changes to the setup based on some feedback!