Increased the file preloading timeout value.
Made some other minor tweaks.