Change words, fix JS