Fixes and updates/polishing the populator
Merge remote-tracking branch 'origin/james_branch' into dev