Code layout changes.

Just updates from the past week or so and have not had time to do any
real code.