Increased robustness, and improved the XKCD example