Overdose Fixes

Makes the code easier to alter. Bit more plain to quickly sort through.