Some small changes, slowly building up the server