More arrayList corrections