mesa WIP: bugfix-only update, minor tweaks, prune features