Clean up array references, add inanimates