Config comments and fixes