Fixed small bug
Fixed js loading
Fixed environment handling