Updating more files with better comments