merged hotshame, pinkrod and thenewporn into updatetube
fix