Updated documentation/improved output