Several demos added, improved infrastructure, refactoring
Further refactoring, better tests