Fix tag parsing and a whole bunch of other things
Fix tag parsing and a whole bunch of other things

shawnps/nihongo,shawnps/nihongo,gojp/nihongo,gojp/nihongo,gojp/nihongo,gojp/nihongo,shawnps/nihongo,shawnps/nihongo