Some improvements in comments, extended macro testbed