preparing grn 21, and some cleanup