bunch of specs, responses to PR comments, factory fixes