updated a ton of stuff. Now syncing with master.