updated stuff
fixed bunch of things