added final touches to calculator functions