Cleaned up A LOT of code and found a few things that need to be fixed, still some left to do