Added neighborhood to tries list, minor tweaks