Added header comments, optimized config