minor tweaks to contouring