small changes done, pre major extension save