Fix js, make minor edits