Added more of Neil's edits