Added new calculator/minor changes

Final changes: ready for launch