More updates - cleaned up with some more whitespace (done inelegantly at first, I admit)