Slight modifications for correctness

I suck