reflect n2o changes + dev styles