More fixes and changes. Working on arrays