More URLs/cleaned, tweaked JS