update & cleanup almost everything
turn on include-ancestor-masks to get control over bounds