Cosmetic changes and few minor bugs.