Fixed Many Things

Issues seem to now be all in the primitives. I fixed a lot of errors,
but couldn't figure out what was wrong with the primitives and I'm not
going to try right now.