fix js issues
merge changes