Small adjustments and Firefox fix.