Updated description and keywords

Also added some organizational fixes and a few notes.