Improved the Calculator - it actually now works. Guys check to see if you guys are right