better name/desc handling