testing cleanup branch, typo fixes