Calculator fixes

Now displays numbers however it's not done yet.