added some stuff here and there... guess server is finished..