Updated some files, thanks Tadashi.