Fix Reload-related Bugs

I think that this addresses the issues you were talking about.

I didn't add tests because those tests are crazy.