updated a lot of stuff
updated a lot of stuff