More improvements to arrangements + config file

Also get rid of daed code.