Commented out names, other minor changes