Add better unicode handling and notice handling