Improved output and added server refresh