Made little fixes, added new exercise formulas