3.0-dev1 update 4.1

JS fixes