Added support for addition and subtraction as well as performed some simple rename refactoring.