Major changes; edit a few things
fix merge conflicts