added hamiltonian and geometry interface to be used in main routine, updated corresponding parts in main toutine