made a bunch of changes

hopefully it works