toc bump + frame manager fixes