Rikua: Update May 18

Fixed minor bugs.