fixed: paths. improved: semanic analysis