Numbering fixed.
Reformating and final fixes.