removed some comments, cleaned config