update some stuff to 1.6