Fix variable names, improve leave, correct join