Going down and other fixes pullrequest