various fixes
fix example
various fix and tweaks