arrays support + minor changes