Fixed some Array Size issue, more fixes to come.