Added more built-in
Fixed arrays