Calculator working just a little better.