a few more fixes to listing and removals
starting to fix up get_next