misc updates/comment removal