Update Readme and improved server mode