Merge messages

Finally! This branch should result in massive speed-ups in parallel runs on AMR-type grid.