fix issues, fix examples