Proper internal linking, minor formulation fixes