Fixed refs; minor edits