ugh fixing some things I missed