combined demos, cleaned up things