#269, adjustments and a piece of #270