Cleaned up demo a bit.