Fixed some bugs I introduced in a last minute refactor.  That's what I get for not splitting up commits and being thorough. (tested them this time too)
Fixed some bugs I introduced in a last minute refactor.  That's what I get for not splitting up commits and being thorough.
(tested them this time too)

Gehn/gw2-cerebro