tested and fixed, ready to test on nets