Merged random-configuration checking script + few fixes