Cleaned a few more things up