updated lot of stuff