Updates for 1.6.2 beta, not done yet tho.