fixes and such
merge of the index changes from laura the removed a duplicate class name