Tiny changes for merger

I feel weird  having a branch out for too long, so lets get  the band
back together, then split up again.