some embarassing indexing oversights fixed