Typo bugfix.
Brought back verification.
Added some missing cleanup().