Made some more changes, but more good ones