Fix bugs, update example, add new example