A few enhancements and a demo console app