Add workarounds for FF problems. Marked useless elements as non-atomic.
Cosmetic fixes only
Removed mysterious garbage code