Better obstacle handling, more careful