removed arrays, fixed booleans