Added options for Server.start and some minor changes