Fix retcode on main.
Use ConfigParser name replacements.
Fixes based on stdweird's comments.