fixed some derps from c/p'ing code