upgrading to 2.2.1 and fixing config file for latest format