Style and speedup and dshape=None fixes

we really just needed `1` and `everything else` here