finish embedded comments, other fixes