some guideline cleanups and fixes