Corrections to the user manual and related cleanup