patching and bugs!