A few small refactors and fixes, moved things over to first episode.
Merge pull request #258 from Clashnia/hqm

A few small refactors and fixes, moved things over to first episode.