changes commenting and language around setup