Relatively big update. Fixed a few things