Added a few details, formatted long lines