More Framework, and Math Fixes