Major update and fixes