ohShi fixes

name really put a curse on this....