fixes on calculator