Fix terminology in help file
Update TODO file