Updated to fully add recursion limits

Also, minor other additions.