updating for kairo.at bug 50 workaround and small other thingys