Added test for stacked clippings and fixed some minor issues.