adjust some measurements, model the bolt hole in the elbows
cleaned up dead code, shortened some pipes