minor fixes to indexes etc.