adds sector-list and tweaks
Merge branch 'develop'

* develop:
  adds sector-list and tweaks