fixed shitton of C++ noob errors