Add working config option.
Do some cleanup of 'puts' statements.