General deletion of comments, removing repeat type entirely for now, other fixes
oops, guess refactoring didn't stick
oops, guess refactoring didn't stick
oops, guess refactoring didn't stick
Conflicts