Combined 'extra' and 'genus' into 'genus; updated documentation.