Merged in changes from Mika's corrections.

Benjamin Mako Hill || Want to submit a patch?