Updated to normalize 2.1.0/1.1.0

Updated to normalize 2.1.0/1.1.0 and also made a few additions of other missing things.