some js changes
merged
need to change clientid tracking