increased options in connection to PAC and fixed template minor errors