More tweaks, trying to get cohesion to work