2 changes to accomodate HTML + Andrea lots of index entries added