Getting acoustics example working in 2D; fixing more 2D bugs