more reordering, added anchor links