fixed hyperref warnings and cleaned up merge

ready to make a pull request to bemese