config command added, cleanup