Added some missing attributes.
SOme more cosmetic changes.