Improvements running client/server in console