fixed some bugs, still population issues