updated stuff a bit