regular commit
Small changes that accumulated over quiet some time.