fix issues and add some examples