Various fixes

Basically fixed everything I had messed up and made everything work as intended. Ready to be tested for balance on 104!