Reversion of changes

[Snowysauce]

The latest revision to the XY calculator undid all of the fixes I submitted earlier. Thus, issue #4 is a bug once again, issue #3 is completely unresolved, and several typos and errors were reintroduced.

[Arty2]

Thank you for the hawk-eyed attention; I really appreciate it!

I will take care of these two during the weekend, but it would be very helpful if you could point out the typos.

[Snowysauce]

Resolved