More fixes + testing