Minor fixed + demo
Minor fixes
Test