Some 1.6 update stuff done, most errors resolved