cosmetic changes and some new test in thesis