V1.2

buggfixes