Changed the order of the attributes

...and updated portions of the code and the comments
Updated last revision's date