remove test cmp; more semantic header add and mark read