Data joins have been reworked and retested.
Minor checkstyle fix.