Exceptions fixed, drawing history became to much