Updated stuff to 1.6.1