Add j6 and j7 aliases for darwin
Add docker subdir
Some fixes.