Added sanity check to CopyRndSettings event; + some code clean up