-Add conspicuously missing friction stuff for circles (and rectangles,
though they aren't used)