docblock & exceptions update