Copied calculator
Little improvements