ENH: Cleaned up and embelished advection