commit after lunch, only little changes