Getting advection example working in 2D; fixing bugs in 2D source