improving several points - assets load