More for issue 8

Firefox fix & Chrome support