Nami & Nico (corrections)

Yoo!, I've made corrections. Think I can jump into clean up now.