Fix class/object attribute error.

Some class attribute were meant to be object attributes, so they have been
added to __init__.