cleanup
add saving of names