updates

updated a bunch of stuff