Fixed some plumbing, giggidy