Major changes.
Fixed FF issues