Some fixes, working on corr challenges