half finished
typo fixes after merge