Added preloader, misc. fixes