minor loading changes