V1.12
internal fixes