fixed all the weirdness and made some more