setSource method tweaks
Merge branch 'source-type'

* source-type:
  setSource method tweaks
  adding a currentType method to get current source type if known