fixes, more work