fixed stuff that didn't work