included some interesting things
fixed merge conflicts