Origin

Fixed a couple things and cleaned up a bit.