Reorderd methods and attributes
Added "Additional Information" sections