Put exceptions in crossexec calls
Cleaned up advection
Merge remote-tracking branch 'upstream/master'