More clean up

Swear I fixed some of these.

Also, changed the ending level to 13, it seemed longer, and it will fit
better later when I work in the full H&H encounter tables.