partial changes
social update & nojs fix