array fixes
objects fixes