added server files and tweaked loading