Minor changes, shouldnt effect anyone, see note

-I had added in a method for testing something, ended up using it later
but it was done in a way that could have cause the availability to reach
an inconsistant state, minor changes to fix it