transform comments, fixes