Fixed a couple extra things