Small updates from the new skeleton provided
Second-pass fixes and cleanup
Updated summary section