ok, that seems fine. i haven't tested this branch yet, will try to this evening. but you can merge if you feel confident it all works correctly cross browser.