Update to fix a lot of issues