added pipe parts, some pipes fall appart, cleanup