listings and index modified

listings and index modified - merging in master