v1.6 various bugfixes