edited a bunch of stuff