updated stuff
fixed merge...