Add traces in 'if', fix paths to ra/, fix bugs.