ENH: Better examples, testing, and fixes