Improve array helper

This updates your copy and adds in the other features to make it a clean merge.