Some more editing.