chinook: more progress/improvements