Change Population settings and small amount of refactoring.