Started on basic server and small fixes