#126 - fixing path overlay accuracy + clean code