fixes, and tests again