fixing brad's red x's in canvas wrapper
fixed merge