Minor fixes and a Limit tool for result windowing