thesis updated refactored to english