fixed a few more things and updated stuff