Ep 2 and 3

Look at the ep2 test file, not the ep 2 [Baka-chi] one
and the [Baka-chi] ep 3 file

If i find anything else I'll close this pull request, going to look at it again in an hour, when my mind is better.