Fixes after testing.
Fix Fennec.
organize