guess more array types correct and bug fix