indentation.
Tokyo continued and Nikko.

Closes #33, #25, #23, #14.