Fix loop so you can reuse calculator
remove some additional questions, still have some to go