Added more commands for the Server and did some minor fixes