Fixed some things maybe
fixed merge conflicts