few updates to setup & patching