more fixes to test..