added and updated stuff
new stuff