Some fixes and new derivations.