some annoying problems but added a bit more sanity back. Need a strict sense of what consumes what, and we should be OK.