updates on policy generator and reated improvements in runtime