Ongoing tweaks and bug fixes. Make short lessons for demo.