added a lot
fixed merge conflicts