Fixed up a few more things to simplify stuff