Fixed a few things...