Fixed exec mapper, added new lightline path, clean code