This fixed a few important bugs that came up as a result of not being thorough
enough with my testing.