fixes for parsing less clean config files.