updated more stuff

I think I got the casts right on the lists ??