Fixing dangling studio references. speeding a few things up