SK version corrections
Even more improvements