straightening out a couple of bugs

Sorry, that was probably my fault