Prettifying everything, added server, minfixes