Added Sandy's notes; Fixed AFF bug