Fix bug, use appropriate variable
Remove legacy comment that is no longer correct
Fix English errors