More fixes, and examples