Making a few important updates.

Needed a few updates to make this a really happening. What do you think, @robertdfrench?