remove a couple of caveats now fixed