add list management and fix small problems