RTC - clean up

listen to index changes
clean up and refactor based on review comments
RTC and move layerComps after layers