Add slimerJS support
+ minor improvement