Fixed a couple more things.