Fixed a few things that were bothering me.