Fixing Bugs and somethings more...
Revert "Fixing Bugs and somethings more..."

This reverts commit b717adf9844601da58dcb177d2ea8082c00597dc.
Trying to let this project normal...
Merge remote-tracking branch 'origin/master'