some remainders from rebase

These files I forgot and a small change in configure.ac