Better invisibility avoidance behaviour.  Better exception handling.