Updates and javascript fix