update to avoid tocsr() call in draw_{w,v}
file call correction