added booleans and arrays, screwed something up when adding the latter