More polish, some firefox fixes