adding comments and converting hard coded selectors into options