fix some formulas
Merge pull request #1436 from votjakovr/feature/gp_refactoring

Fix some formulas