last additions, ready for corrections