change config style (split in two files) + corrected queue bug