clean up master
show comment count
change old syntax