added fill-assoc and fill-empty