Fixed some stuff

Uncommented alot of code that i commented trying to fix a bug, the bug
is still there Q_Q