Improved output, cleaned up documentation