updated stuff. almost done