Code Fixes

Moving code broke code so I fixed code.
JUST IDE STUFF