add collapse and some other minor fixes to AJA