Fixed issues, added demos.