Integration of lists and fix some bugs