Cleanup doc and provide more info about ouput params