adaptive neighborhood. minor fixes