Finish out arrayvals
t/ improvements