A bit more tidying and tweaking for ghost tunnel wraparound