Added all association cues.
Some code cleanup.
Fixed typo.
Cleaned up code.