8 Commits (bug/type-edits)