batch of bug fixes, typos, renames