Update most code to work with 1.4.6 and other item improvements