Fix the boundary bug; make radius optional