Fixes and updates/polishing the populator