Formatting and upto #30
Partial outline updates