Changed executables path, added more TODOs