fixed null values
fixed null values
fixed adding to lists