Small changes in array. Various improvements related to stubs.