stephs fixes