cleanup
add options to set name and publichostname