Fixed Arrays to Object, some bugs remaining