Point in boundary fix + populate fix