Bug fixes and improvements
ListEP interface, more bug fixes/improvements, private methods