Style and speedup and dshape=None fixes