Added index, first corrections from dry run