Preloader Base work
Minor fixes