bugfixes, changes to list code