many updates

a bit more narrow now
mm