Cleaned up demo and examples