Updated int limits, more elastic nesting