Gah, accidental diff
Update comments and function names