merging stuff

I had some conflicts too, from you fixing conflicts. Something funky is going on... try this.