updated bunch of stuff