Added a demo button, fixed some issues.