allow null angle
add local TODO items for CLOS surgery