Recursive calls, and other fixes