fix advection assembly blocks
fix block indices in several places
remove debug output