ENH: more options and full_output