Merged / Fixed a few things...