patching a few things...