loading fixes done