fixing more shit that I fixed earlier but didn't commit and promply overwrote on a pull