fix some breakage, MOG DID IT!!!