sk, some bugfixes/dorf code