Fix input!

Not the issue but the errors I caused from refactoring
Fix everything (I think) except Still Air

ughgghhghghhg