Adding tons of stuff I guess (Plus some fixes, yay)