deal with exceptions a bit better
make the notes more useful here