Working on various minor issues, such as better handling of limits, etc.