Minor changes, added comments to mark methods returning empty lists/sets
and which methods we still need to implement.