added missing k21 derivations, fixed some non-linear equations...