Removed old check for the thread issue in mura.
Tweaks to the way that datasource is defined.
More tweaks to old functions