removed stuff I shouldn't have commit and commented some more