Improve Airfoil demo code (+ fix decls)