More corrected markup and various TODO items
Consistency on certain index terms