Rectangle, other improvements/cleanup in CSG