changed loader & plenty of stuff