some minor fixes, and addition of the actual index