fixes segments; updates sources