Added map_remove_if + small fixes