A few comments & minor restructuring. Indicating things that need fixing.