More awesome stuff.

Fixed some stuff.
Fix'd