Illustration code + other minor fixes