added another firefox fix and cleaned a few things up