Made sure everything works

And, when it didn't, fixed it.