comments and state/index designations
updated indexing