Update to 1.6.2 and small imporvements