minor fixes, test of delimit mechanisms