Minor clean-ups.
Added a few override modifiers and fixed some documentation.