removed some plumbing
some updates