All paths fixed. More code cleaning