Fixed a few things and updated