Added two more operators and improved spec