fix some funky things