Cleaned up demo, added keyboard support