fixed stuff that I messed around with