refactor
fix examples
wip