Added new calculation features, removed factorial limit