More work on servelets