Stability and API improvements to Controller/join

Should work...to be tested.