Some changes to calculator js