Better calculator

It's still an basic caculator, but fixed bugs, and handled strange
usage.