osc
"fixed" osc, was a port problem
Merge branch 'osc_fixes'