Fixed refs, minor edits