clean-up and un-comment indexing code
increase local id length to 32