Small class changes.

Small tweaks from working in class.