Andrea starting index entries + minor changes