eliza/index improved, minor fixes