ENH: fixed bug, updated output