added loader and bootstrap improvements