Bug squashing on the refactor. Everything seems to be stable and operational now. Further testing need obviously...