SK mode: lots of bugfixes