Improved rater
Improved formatting in config.js
Merge