Cleaned some more, did some other stuff