Fixed scaling issues, implemented colonies and contains method