Some fixes and edits.