Simplification

-Fixes to logic, but still breaks on teapot and doesn't render all the
faces of the cube

-Combined updatecosts with make validpairs