cleaning up remnants of bad rebase merges and modernizing some sections