Fixed several problems found during simulation. Now need to figure out how to initialize the tube properly

Change-Id: I2f9cd20c6662bbda8f622e06ca2ff854f8f5e422