rollout sterm, various fixes