JS fixes, content improvement