fixes and 1-based index search