Integrate the rest of Juan's edits