some fixes and example update