Fixed more problems >_<