bug fix and update array, map