More CV work.
Minor bug fixes
Kanako bug fix.