Multiple clean-ups, added pwd confirmation, added debug parameter, ...