Added radact

Plus other code changes here and there.