Nearby.java updated, still has bugs