Better error handling, linguistic fixes.

please tag as 0.17