official update for 1.6.2

cleaned up code as well