Fixed a few things