Fixed associatively and renamed a few things.