Updated some more random stuff to make things a bit cleaner.