Added a bunch of changes.

-Dan