Lot's of minorimprovments