Fixed executables + revised template