Additional documentation and fixes for enumerate