Some fixes and new examples