Add storage to array list, fix some setting writes being skipped