quite a few small changes, shame on me