Added some updates
fixed a bunch of stuff