couple of more FF and IE fixes, still not working on IE11 though...