Added populator system

Added populator system and fixed a few bugs