typos, tests fixes, styling/lint