Made various fixes to the 1.1 version.