Upgrade to v1.6

multiple small improvements