minor order change js+edits