Update + fix a few errors