update entity and minor changes to calculator
bump version