Work on primitives

Other minor updates/changes like fleshing out the Clamp methods.