fix part 3 up (quick exit, and join problems)
merge work