defense: boatshape graph and minor tweeks