Made everything work

changed some random things, now nothing is overtly broken