some firefox fixes, began work with r2d3