options, formatting, js changes