Fixed genki-4, added -5 and -6