Improved Loading
Minor changes