K2 + some fixes here and there