Did a bit of cleanup in FireBreath. Also resolved #22.