display bugs
Merge branch 'oc_display'
remove console.log