added content, fixed one of the affix bugs