Change string to list and fix some ds