fix errors
comment out oc.extend() lines for now