Added some more cosmetic changes and latest SQL dump for v2.2