6.22 - fixed many bugs, but not yet to next checkpoint.