Some sweet updates.
Finally kind of done.