fixes to lists and simplifications