added a bunch of stuff and updated a bunch of stuff