- tweaking, fixing (hopefully) some freeze problems