fixes and adaptation to reality