fixed association bugs, added line that Sam's before had destroyed previously