Add comments and clean up some sections.