- Some optimizations & logging cleanup, logging enabled w/ a bool now to
  remove the overhead when not testing