last fixes and js-beautify